Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

перенос текстур #17

Merged
merged 2 commits into from
Jun 27, 2024
Merged

перенос текстур #17

merged 2 commits into from
Jun 27, 2024

Conversation

Darkiich
Copy link
Contributor

@Darkiich Darkiich commented Jun 27, 2024 •
edited by Schrodinger71
Loading

Описание PR

Этот ПР переносит текстуры со старой репы
Медиа

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

no cl

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 27, 2024 •
edited
Loading

RSI Diff Bot; head commit 3915838 merging into d1db5ef
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Actions/slime-hair.rsi

State Old New Status
hair Added

Resources/Textures/ADT/Clothing/Back/Duffel_Durathead.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/backpack_OR40L.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/backpack_OR80L.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/backpack_RKS2.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/blacklady_satchel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/criminalist_back.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/ertleader_cyb.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/heart_backpack.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/heart_satchel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/kivchikset_satchel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/lapkee_satchel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/leatherlady_satchel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/ninjasatchel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/syndicate_bag.rsi

State Old New Status
equipped-BACKPACK Added
icon Added

Resources/Textures/ADT/Clothing/Back/ussp_attaked_backpack.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Belt/black_suspenders.rsi

State Old New Status
equipped-BELT Added
icon Added

Resources/Textures/ADT/Clothing/Belt/criminalist_webbing.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi

State Old New Status
equipped-BELT Added
fill-1 Added
fill-2 Added
fill-3 Added
icon Added

Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Belt/leather_suspenders.rsi

State Old New Status
equipped-BELT Added
icon Added

Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Belt/officers_belt_with_holster.rsi

State Old New Status
equipped-BELT Added
icon Added

Resources/Textures/ADT/Clothing/Belt/pyotr_sheath.rsi

State Old New Status
equipped-BELT Added
sheath-sabre-equipped-BELT Added
sheath-sabre Added
sheath Added

Resources/Textures/ADT/Clothing/Belt/rps_tactical_ussp.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Belt/rps_ussp.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Belt/sec_auditor_holster.rsi

State Old New Status
equipped-BELT Added
icon Added

Resources/Textures/ADT/Clothing/Belt/sheath_OCK.rsi

State Old New Status
equipped-BELT Added
sheath-sabre-equipped-BELT Added
sheath-sabre Added
sheath Added

Resources/Textures/ADT/Clothing/Belt/supreme-commander-sheath.rsi

State Old New Status
equipped-BELT Added
sheath-sabre-equipped-BELT Added
sheath-sabre Added
sheath Added

Resources/Textures/ADT/Clothing/Belt/supreme-sheath.rsi

State Old New Status
equipped-BELT Added
sheath-sabre-equipped-BELT Added
sheath-sabre Added
sheath Added

Resources/Textures/ADT/Clothing/Belt/tsf_magbelt.rsi

State Old New Status
equipped-BELT Added
icon Added

Resources/Textures/ADT/Clothing/Belt/tsf_medbelt.rsi

State Old New Status
equipped-BELT Added
icon Added

Resources/Textures/ADT/Clothing/Belt/tsf_webbing.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Ears/Headsets/armyheadset.rsi

State Old New Status
equipped-EARS Added
icon Added

Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi

State Old New Status
alt-equipped-EARS Added
equipped-EARS Added
icon Added
icon_alt Added

Resources/Textures/ADT/Clothing/Ears/Headsets/headset_paramedic.rsi

State Old New Status
equipped-EARS Added
icon Added

Resources/Textures/ADT/Clothing/Ears/Headsets/trader.rsi

State Old New Status
equipped-EARS Added
icon Added

Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi

State Old New Status
equipped-EYES-hamster Added
equipped-EYES Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Eyes/Glasses/neontactical.rsi

State Old New Status
equipped-EYES Added
icon Added

Resources/Textures/ADT/Clothing/Eyes/Glasses/pink_glasses.rsi

State Old New Status
equipped-EYES-hamster Added
equipped-EYES Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi

State Old New Status
equipped-EYES Added
icon Added

Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi

State Old New Status
equipped-EYES-hamster Added
equipped-EYES Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Eyes/Glasses/supreme-commander-glasses.rsi

State Old New Status
equipped-EYES Added
icon Added

Resources/Textures/ADT/Clothing/Eyes/HUD/advanced_hud.rsi

State Old New Status
equipped-EYES Added
icon Added

Resources/Textures/ADT/Clothing/Eyes/Misc/eyepatch_tretyakova.rsi

State Old New Status
equipped-EYES Added
icon Added

Resources/Textures/ADT/Clothing/Hands/Gloves/Halloween/biomerc_gloves.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/ADT/Clothing/Hands/Gloves/Halloween/red_martial_gloves.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/ADT/Clothing/Hands/Gloves/Halloween/vyazov_gloves.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/ADT/Clothing/Hands/Gloves/New-Year/gloves_red.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/ADT/Clothing/Hands/Gloves/New-Year/gloves_red2.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/ADT/Clothing/Hands/Gloves/New-Year/gloves_snow_maiden.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/ADT/Clothing/Hands/Gloves/New-Year/mittens_blue.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/ADT/Clothing/Hands/Gloves/New-Year/mittens_green.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/ADT/Clothing/Hands/Gloves/New-Year/mittens_red.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/ADT/Clothing/Hands/Gloves/New-Year/mittens_red_green.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/ADT/Clothing/Hands/Gloves/brassknuckles_gloves.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/ADT/Clothing/Hands/Gloves/crusher_gauntlets.rsi

State Old New Status
equipped-HAND Added
icon-lit Added
icon-uncharged Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Hands/Gloves/gloves_sport.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/ADT/Clothing/Hands/Gloves/gloves_sport_step.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added

Edit: diff updated after 3915838

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# labels Jun 27, 2024
@Schrodinger71 Schrodinger71 changed the base branch from master to adt_content June 27, 2024 20:09
@Schrodinger71 Schrodinger71 merged commit fb07f37 into AdventureTimeSS14:adt_content Jun 27, 2024
10 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Darkiich Darkiich

@Ratyyy Ratyyy

Labels
Changes: Sprites Изменение спрайтов No C#
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Darkiich @Schrodinger71 @Ratyyy